# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1390  -> 1.1391 
#	include/asm-ia64/io.h	1.15    -> 1.16   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/26	alex_williamson@hp.com	1.1387.1.6
# [PATCH] ia64: turn off ALLOW_IOV_BYPASS
# 
# Since the BIO-layer assumes that blocks can be merged virtually
# at the granularity of BIO_VMERGE_BOUNDARY, independent of what device
# is in use, we always need to go through the I/O MMU, even for 64-bit
# devices.  Hopefully, the BIO-layer can be made smarter some day.
# --------------------------------------------
# 03/06/26	davidm@tiger.hpl.hp.com	1.1391
# Cset exclude: davidm@tiger.hpl.hp.com|ChangeSet|20030621161908|14888
# Cset exclude: davidm@tiger.hpl.hp.com|ChangeSet|20030621161905|15263
# --------------------------------------------
#
diff -Nru a/include/asm-ia64/io.h b/include/asm-ia64/io.h
--- a/include/asm-ia64/io.h	Fri Jun 27 22:42:03 2003
+++ b/include/asm-ia64/io.h	Fri Jun 27 22:42:03 2003
@@ -424,6 +424,6 @@
  * which is precisely what we want.
  */
 extern unsigned long ia64_max_iommu_merge_mask;
-#define BIO_VMERGE_BOUNDARY	(0UL)//(ia64_max_iommu_merge_mask + 1)
+#define BIO_VMERGE_BOUNDARY	(ia64_max_iommu_merge_mask + 1)
 
 #endif /* _ASM_IA64_IO_H */